add memberClusters selection #87
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MatousJobanek
requested review from
xcoulon,
alexeykazakov,
rajivnathan,
ranakan19,
mfrancisc,
drpaneas,
metlos and
fbm3307
as code owners
mfrancisc
approved these changes
Oct 18, 2024
mfrancisc
reviewed
Oct 18, 2024
metlos
reviewed
Oct 18, 2024
| // should be skipped if there is at least one selected member cluster | ||
| // and | ||
| // the name is either empty or is not specified in the selected member clusters | ||
| return len(s.MemberClusters) > 0 && (memberName == "" || !slices.Contains(s.MemberClusters, memberName)) |
There was a problem hiding this comment.
Does this mean that there can be no "apply this entity to any member cluster"?
There was a problem hiding this comment.
yes. It's already the default behavior for the cases when you don't specify any permissions in any member cluster.
fbm3307
approved these changes
Oct 18, 2024
fbm3307
approved these changes
Oct 18, 2024
| @@ -47,7 +46,7 @@ func ensureUsers(ctx *clusterContext, objsCache objectsCache) error { | |||
| ctx.Printlnf("-> Ensuring Users and its RoleBindings...") | |||
|
|
|||
| for _, user := range ctx.kubeSawAdmins.Users { | |||
| if ctx.specificKMemberName != "" && slices.Contains(user.Selector.SkipMembers, ctx.specificKMemberName) { | |||
| if user.Selector.ShouldBeSkippedForMember(ctx.specificKMemberName) { | |||
There was a problem hiding this comment.
should we keep the empty name check here?
There was a problem hiding this comment.
the same, the check is part of the method
| @@ -16,7 +15,7 @@ type clusterContext struct { | |||
| func ensureServiceAccounts(ctx *clusterContext, objsCache objectsCache) error { | |||
| ctx.Printlnf("-> Ensuring ServiceAccounts and its RoleBindings...") | |||
| for _, sa := range ctx.kubeSawAdmins.ServiceAccounts { | |||
| if ctx.specificKMemberName != "" && slices.Contains(sa.Selector.SkipMembers, ctx.specificKMemberName) { | |||
| if sa.Selector.ShouldBeSkippedForMember(ctx.specificKMemberName) { | |||
There was a problem hiding this comment.
should we keep the empty name check ?
There was a problem hiding this comment.
it's already part of ShouldBeSkippedForMember method logic
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #87 +/- ##
==========================================
- Coverage 69.59% 68.00% -1.60%
==========================================
Files 43 44 +1
Lines 2565 3175 +610
==========================================
+ Hits 1785 2159 +374
- Misses 589 825 +236
Partials 191 191
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
so we can specify that particular users should be provisioned to a specific member cluster only (eg intel in DevSandbox)